used hard reset to merge remote and master branches