fixed merge errors / user cache issue