unitygit add -A
fixed conflicts