Update to master, resolve conficts