toolbar comments
clean up
merging files
resolved merge conflicts