merge conflict resolved again