commit to new branch
fix conflict