Nirav fixed the blank space
Fix merge conflicts in css