Added line to test in clones.
Fixed conflicts.