fixed my merge conflict fail