fixing some sytax and logic in setting preferance command
fixing merge conflicts an typo