Some update
Solve conflicts