conflict resolved 3