git fixed, going to merge branches