[MERGE] Fix minor files differences