fixed merge conflicts and removed coverage folder from git repo