USAgit add .!
Merged conflict