remove old merge