adjustments
fixing merge