Fix merge
Fix merge conflicts