Fixed accidental commit of conflicted files