fixing merge errors