final merge and changes