repeats are working
fixing merging issues