Modified rc
fix merge