fixing merge errors
fixing merge errors