showing rocky
resolving conflict