bug fixes.
resolve conflict