changes by developer 1 with no conflict