committing all work
committing conflict file