edited readme to cause conflict
resolved readme conflict