Implement --no-merge to allow config reset upon commit