add boilerplate
resolve conflicts