Add rake task for yml config and add fallback configuration if yml file is not present
Resolve merge conflicts