timmacs: slick merge before