resolved conflicts between rpbi and master