Reverting messed up conflicts.