Merged everything back