1.txt 114 Bytes Edit Raw Blame History 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 12 34 56 789 dev 567 dev 1 <<<<<<< HEAD dev 2 dev we ======= feather 1 feather 2 >>>>>>> feather qw1 qw2 dev