Fixed final merge