reverted to previous commit
attempted to fix merge errors