file has been merged