Fitting Markers
Done
Fixed conflicts