Local 2 repo edit to local2.txt
Fixed Conflict in local2.txt