Provided a default approach to override variables
fixed conflicts
fixed merge
improved readme