removed remnants of conflict resolution
fixed a list