Fixed merge conflict and got karma task working in grunt