fixed conflicts due to changes not made with git