Merge conflicts removed