Added extra message for Jamie
Fixing conflicts and spacing