commit before merge
fixing conflicts