rearrange the code.
Resolve conflict.