Updates to merging, notes, modified defaults for testing