[#367] Fix merge issues