Tidy up dodgy commit merge