Reduce tile size
Fix merge conflict