Giant Merge and Git is OK now