commit some local files
fix conflict