bugs 1
merging