fixed ngrepeat
merge conflict