merging staging to master with new cap files