attempt 2 for gitflow plugin