testing merge hooks now