edited to pull my branch before pulling upstream, make prettier