Fixed fixed merge conflict