resolved comflict