some commitable changes
branches merged