added delayed jobs
resolved conflicts