Fixing some sking merge issues