Changed favchar
Merge fixed