merge sunny conflict