adding changes with a new commit
adding fixed issues
pushing merge fix