refactor code
resolve conflict
merge