merge with other code