Oct 27th Merge Resolve