more progress
fix merge conflict