Fixing conflicts
fixing merge conflicts