Adding a line to git.clone.test copy
resolved conflict