updating repo
updating repo changes, fixing merge
adding unmerged files