fix merge conflicts by manually re-applying changes

fixes #1 and #6