commited by file by file merge