commit 3
fix merge