minor - conflicts resolved (2)