fixed some atoms
fixed conflicts