Updates to merging