icon job
icon job with confilicts solved