this fixes #2
resolves conflicts and this fixes #2