trying to fix this merge mess