no platidoma
fix regex
fix merge conflict