Change diff font to "Source code pro"

Change-Id: I7f605111811c45e6c28474c5eb0cb01eeedf1db7
Don't crash when checking out remote resulting in conflict

Change-Id: I7f2f6e1dafb5223444e27180b5e24f7c4fed11f9