merge conflicts fix