Add merges stuff, first working version