Changes merge=union
