add reason for retro
fix conflicts