Merged, and fixed, lets try not to break git