committed files after the merge