changes local morefile
after Merge conflict