Removed merge conflict thing