combine with main -a commit