i added a feature
fixed merge conflicts