fixing merge conflicts - updating feature dependency versions