commite before pushing to new branch
fix conflict