removing <<< HEAD

stupid head