manage version conflicts and keep the last