resolve bug
resolve conflicts