new question + conflicts resolved