Revert "Revert "Merge fixed""

This reverts commit c4c29e7518fd95151335618b633f703b3b93ca18.