add hamle
update notes
add conflicts section
test
update notes
update notes
fixing merge