Merging resources typing back into master