added repetition
fixed merge conflicts