Add files and merge platoon.lua