Removed merge conflict stuff