bugs by merge