annotate button working
merging button conflicts