add directory
resolve conflicts