Whitespaces
Changed from fsFactory to interface
Improved solver constructor interfaces of conflict solver