Master

Will need manual resolving.