updated merge definitions and ignores