made a few edits
small edits here n thurr
fixed merge conf