fixed MORE merge errors