Remove giberish caused by merge conflicts.