database issue
resolve conflicts