fix git pull conflict