fixed final merge