commit from crossroads
add solaris
resolve conflicts