for merges conflict