resolving jade conflict