Fixed lockfile conflict