clean up some merge but still bug in cache