added year and post to merge