remove line to encode words and fix position bug
fixing conflicts