Git is giving me problems. Trying to merge.