auto merge after pull
auto merge after pull