conflict resolved??