got swipe to compile properly
fixed the merge conflict