fixed error from messy merge reverting changes