fixing merge conflict
fixing merge conflict

driftyco/ionic-site,ionic-team/ionic-site,ionic-team/ionic-site,ionic-team/ionic-site,driftyco/ionic-site,ionic-team/ionic-site,driftyco/ionic-site,driftyco/ionic-site,driftyco/ionic-site