commiting and then moving back to main branch