removed faulty code from merge