styling and fix a conflict