Changed helpers to handle merge conflict