fixed merge conflicts
Revert "fixed merge conflicts"

This reverts commit 7a7a9723302ce6d2a5efe8e0be5d36fe6c94b068, reversing
changes made to 07724a9fc37ab4fa630fe120536f4fbb2b27d382.
fixing
Revert "Revert "fixed merge conflicts""

This reverts commit 43e126f22ca99ae9452fb2cee07c17de46a88105.
merr
...
trials
updated api token
merge conflicts
Merge branch 'master' of https://github.com/pramodsum/Skillfil