added tech blog and updated conflict image