added some explanation to merge conflicts. and RAW view direction
added username/password line