initial merge
merged all the things