dataplay This is a test :) <<<<<<< HEAD (merge destination) merge conflict lalal merge conflict finally (merge from) b1 maybe I should get merge-tools