add histignore
merge from remote