Fix merge conlict for mockup.ep