fixing local git master
fix merge conflicts