adjustment

Removed merge issues.