Added missing space in versionconflictwindow message
Added workaround for same-frame issue