fixing merge
fixing merge
fixing merge and adjusting models