Finish merging, i suck at git