my latest modifications
my latest modifications and resolved conflict