creating a merge conglict
bug fixes