Merge ingame with master