merge no edit