rest repository
merge conflict
clean old sources