cherry-pick acac0430a0
add to gitingore & rm ~ file