Fix merge error between master and content branch