ben - fix the conflict at master page