fixed old merge