Merge project fix.