fixed letters
fixed conflicts