resolving yml conflict