coflict resolved