Clearing conflict
clearing conflict