Project file differences from recent merge