fix unix encoding
fix merge conflict