everything in working condition after merge