fixed merge rebase conflicts with master #359

Closed thomasduy closed 2 years ago