edit readme
test lagi
manual merging