Slightly more formatting for merge