example dir commit
resolve conflicts