add note about git lol

Oh noes, a conflict!
Just in case you need one.