Fixed conflicting issues between Master and Erik-Master