merge with working