if plan==null fixed
conflict bikhod fixed