update from master

core/rgbnir_definition.json

@@ -75,9 +75,6 @@
     ],
     "data_type": "Uint16",
     "name": "RGBNir"
-<<<<<<< HEAD
-}]
-=======
 },{
     "bands": [
         {
@@ -818,4 +815,3 @@
     "data_type": "Float32",
     "name": "float32_grayscale"
 }]
->>>>>>> master

wait_for_container.sh

@@ -4,10 +4,7 @@ while [ -z $(docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /v
     sleep 20
   done
 
-<<<<<<< HEAD
 while [ -z $(docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py id list) ]; do
   >&2 echo "Collection is not created yet - sleeping"
     sleep 20
   done
-=======
->>>>>>> master