entity post
merge fix