merge rama manuel