merge rules to master