merge: encoding problem fix
merge: remove trailing whitespaces option