Fixed vcxproj and Input.cpp blank space
Fixed merge issues and blankspaces that was lacking.