Committed to deal with merge conflicts