handle another surprise merge of develop into master