handle merges properly
actually check merged value
Merge pull request #11 from nathan-lafreniere/fix_merge_message

handle merges properly