stashing changes
fixing conflicts