Perltidy and conflict resolve