Yes, but once you merge, you have to update the changelog so that you don't forget anything