added coffee rule.
fixed conflicts