changed add message
added new test case
added new test case
fixed conflict
added andrew hack