merge feature joe