fixed merge errors
fixed merge errors

pioneers/website,pioneers/website,pioneers/website,kev-chien/website,kev-chien/website,kev-chien/website,pioneers/website,kev-chien/website,pioneers/website,kev-chien/website