dev add note
master add note
test.txt fix conflicts