I may as well merge them
I seriously need to get better at git