merging file with frontend team