fixed Merge conflicts