Merge Tips from Sean