Conflicts merged