a combination of 2 commits