removed the path from log
resolving the conflicts