Merge with master tree