pushed Resolution model after merge