resolved some conflicts/issues created by my git newb status