1. resolve conflicts
1. fix bug