memo edit activity layout and color change
merge conflict