fix file added before merge are moved