Fix top gap
Fix merge conflict