collapsed labels -> added notes on how to merge changes