merge some changes with origin
add ignores