fixed empty carousel look
fixed merge conflict