fix lingered merge error + some updates