Merge fix
Pragma once