Fix merge conflicts

Fix merge conflicts