Merge conflicts solutioned