fixed the earlier merge