recovered poor merge