Fixed replaced
Added classes merge