Fixing more weird merge issues