git pull resolve conflicts automatically