Fix conflict.
Add fileencoding settings.