Fixing the MOVED and UPDATING files for my last conflict