merge tra nicoladl e fabryz frontend