Removed merge conflict