Update local.xml
Create EricTest
Update EricTest
Update Eric Test 3
Update Eric Test 4
Update EricTest
Update EricTest
Create ericTest2.txt
this should be clean
fixed local.xml confilct