Adding arpix
resolving conflict