resolving changes
fixing conflicts