Merge with master complete