developing on new setup
fix merge conflicts