preparing files for merge into develop