fix regex
fix merge conflict