Fixed local conflicts