本地的修改
merge from origin
add git attributes to protect local properties