merge new  commits

periodically merge new commits