Commit to prepare for merge
Attempting conflict resolution