Adding config after resolving conflicts.
Adding config after resolving conflicts.