confloict resolved