removed <<< HEAD mesages