merging kwamaking master