Fixed merge conflicted mistake