merge doftable with develop