Merge a lot of code