[Update] - conflicts resolved