3:30am - I hate merging on git