# Conflicts:
#	resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
#	resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php