Fix a lot of conflicts in merging