conflict resolved 2