fixed all the diseases and git errors
merging