100% finished
change to unicode
fixed conflicts