added a line from hithas branch
from chandra
adding after conflict
add and deleted a file
added one more line to cp