S4S Merge issue