merge fixs