after resolving profile conflict