merged solved