creating conflicts
resolved  conflicts