Merge mostly working (just not comments)