ugg, I need to better understand git and how to merge changes