Revert "Fix merge conflicts"

This reverts commit 7ef6b010382319c8677b07d62cf7906cbae41c73.
Fix merge conflicts