merged file got commited with merge diffs still in place.