fix lost merge