schtyles
resolving conflicts