Some merging work, TODO