post-merge, cleaned up one conflict and trying to re-commit