fixing merge mess