resolve conflict mainview