commit all files
resolve conflicts