Resolving Conflicts ... Still there're errors that should be fixed