Whoo, finally figured out the merge fuck up.
Working everything.