Conflict in query solved!
another confilct in query