Fix mergePrefs.py

Set Line ending to unix LF
Fixed the order which perfs are merged