Actually fixed it this time
fixed pull merge conflict