creating conflict from develop