make sure you use unix EOL characters --- this line should be removed from the diffs