fixed a small thing
resolved conflicts