Merge and cleanup. My bad. Need to sleep sometimes