lovely monday morning
fixed conflicts