Attempt fix for merge