conflicts resolved, references included!