suggestion(s) conflict fixed