Resolved circular dependencies that caused Java exceptions
completing merge