Updated dominique getdirection method
my git is freaking out because there are 'conflicts', so i am comparing the conflicts an keepng the remote (Kaseys) and discarding the local (Mine)