better mobile support (not amazing, but better )
resolve merge conflict