change nav
resolve conflict