re-added items template
resolved conflicts