merge dev with ken2, not ken2 with dev only
fixing conflict