couple fixes
resolve conflicts