REFACTOR
fix merge conflicts