Update after styling
after fixing merge1