Fixed "failed" merge