fiing merge mess