Merge so far