refactor
resolve conflicts