Merge Local Changes from Hint