Merge Conflicts fix

Fixed merge conflicts