Merger Selvas code