Merge of mines and gun code