Cleaning up a merge mess and will read up on git merging ASAP