save laptop changes
save local changes before merge
lots of new working curves