initial version
resolve conflicts