fixed minor merge errors: duplicate method declaration