made some styling
conflicts fixed