display inline
fix conflict while reverting commit 58c6bde