Remove accidentially commited merge conflict