Merge Conflict Resolution: Classification or Generation? | IEEE Conference Publication | IEEE Xplore