Fixing after Pull/Merge Debacle