Hellrage branch merge