another conflict codes... resovled..