conflict resolved now