As I learn git these errors will hopefully become less frequent. I don't even know how this project file got into 1.0.5
Merge branch '1.0.5' into development

Conflicts:
	SerialPortCommunication/SerialPortCommunication.csproj