modify algorithms
merge code
resolve conflicts