fixing merge conflict type things
fixing faculty pics