end of saturday progress
fixed merge conflicts