merges embedded code with master