Hand Merge and clean stuff