Fixed some merge errors
Fixed some rebasing bugs
Fixed a typo