need to figure out how to better merge using git