little tweaks
solved conflict