style fixins
merge