mergefix
rm files