add master_ignore
make a common change
another try partial merge