further clean conflict for merge