display error message correctly
resolve conflicts