Accidentally commited an unfixed merge file