changes to skandascowtest
resolve conflicts