fix changes merge mess