merged changes form clifton