Start reconciling source and master
Match existing master's style