add merge
dev commit
save readme.txt
dev test