creating a merge error for james because i need to add a method