testing merge - made change #1