fix merge mistake and add meme captain