Changed project name
Fixed merge issues and 1 line number missing