merge phalcon