the conflicts are resolved|manigann,melaniem