merge as one commit