First commit
Fixed a non-existent merge conflict