merge conflicts in my lab laptop
merge conflicts done
change to static final