resolving conflicts
merge conflicts, again