Added schema
resolve conflicts