merge feature branch that shouldn't be