Fully merged again