Added mock merge