stopping point;
finished stories 1,2,3
fuck you git
fuck you git 4 ril
conflicts resolved