removed additional lines introduced by merge