cleaning up merge + adding weapon files