merge

fix this exception
2014-02-24 15:00:02,097 [  12391]   INFO - om.intellij.psi.impl.DebugUtil - PSI invalidated outside transaction
java.lang.Throwable
	at com.intellij.psi.impl.DebugUtil.onInvalidated(DebugUtil.java:571)
	at com.intellij.psi.impl.source.tree.TreeElement.onInvalidated(TreeElement.java:223)
	at com.intellij.psi.impl.source.tree.TreeElement.rawRemoveUpToWithoutNotifications(TreeElement.java:386)
	at com.intellij.psi.impl.source.tree.TreeElement.rawRemoveUpTo(TreeElement.java:340)
	at com.intellij.psi.impl.source.tree.CompositeElement.remove(CompositeElement.java:887)
	at com.intellij.psi.impl.source.tree.CompositeElement.access$400(CompositeElement.java:51)
	at com.intellij.psi.impl.source.tree.CompositeElement$7.makeChange(CompositeElement.java:921)
	at com.intellij.psi.impl.source.tree.ChangeUtil$2.runInner(ChangeUtil.java:190)
	at com.intellij.pom.impl.PomTransactionBase.run(PomTransactionBase.java:44)
	at com.intellij.pom.core.impl.PomModelImpl.runTransaction(PomModelImpl.java:138)
	at com.intellij.psi.impl.source.tree.ChangeUtil.prepareAndRunChangeAction(ChangeUtil.java:177)
	at com.intellij.psi.impl.source.tree.CompositeElement.removeChildrenInner(CompositeElement.java:918)
	at com.intellij.psi.impl.source.tree.CompositeElement.replaceChild(CompositeElement.java:692)
	at com.intellij.psi.impl.source.codeStyle.CodeEditUtil.replaceChild(CodeEditUtil.java:203)
	at com.intellij.psi.impl.source.tree.CompositeElement.replaceChildInternal(CompositeElement.java:540)