Fixed hell merge