Test commit merge