commit to pull
fix conflicts