removed confilct