merge with andre