accidentally deleted a method to resolve a conflict. Reverted the change