Try To Commit before merging
Merged the conflicts.