implement feature 3
fix merge conflicts