Removed merge conflicts