updated to remove merge conflict