wednesday morning
conflicts fixed