committing stored changes
fixing conflicts