add file_c
remove file_a
merge with new_branch