test git pull conflict
add another script