reverted to latest jgitflow