test commits into 1
both master commits in one!