merging kivy
merging kivy