Solved merge conflicts