before merge
fix conflict and merge