task edits
addressed merge conflict