fixes #3
fixing the merge conflicts