Fixes small merge conflict