bug fixes
resolve conflicts