handle the master act.php conflict

Signed-off-by: Demonsu <245681117@qq.com>