For commit and fixing conflict
For commit and fixing conflict