removed confilcts