merge with master; fix conflicts