before merge
fixed styles after merge