Improved the help text of import
Fixed a merge conflict presentation bug
Fixed incorrect use of single line if
Fixed a critical bug in import and reenabled previously failing tests
Fixed a wrong return value in case of a merge conflict