conflict merge, association typo and no end time