manul confliction resolution for merging