git pull does now everytime a --rebase option to prevent merge conflicts
Add 'rerere' option, stands for reuse recorded resolution llow record and reuse previous conflicts resolutions