Accidentally committed conflicted file