fix TTA-83: fixing conflicts

Author: Rodrigo Lins

.dev.env

@@ -6,3 +6,6 @@ Makefile
 .gitignore
 *keys.ts
 *.keys.json
+.git-crypt
+.git
+Dockerfile

.dockerignore

@@ -0,0 +1,2 @@
+�
���aȞiި
�q�y���3T���H�1�m�*le���	xl��[P)q�骋�*�+����5"���,��Oؓ�E0u��apڊ
֡��cj����
`��N����0j�
���b��̠a��1�s���>����_ �@˽,u���s&�j��~�W1iUyc���\�����Ϊ��i˛���E͛�h��js��%�R#��w)ñ���֊PC��s��̸H巊�b�Y B<�6E�f��(��������5���t\U6\S�I5��'�8��L�*��yx2��WIlC<�
+"	�F�*���h���5~���2Y�?b�F�a�ӡ�&!�$8���,�͕_���q26J��JyaOA�=A���Q�:j�gS6��͠`�$X��w�˴��	
���H |V��4*g|�*s�uc�DZ��m�����c�LG��2Ξ;�`�^��I�d& ԓ�  ��>�d��ɥ7g�����C��)B"?��A��K���<�el�@��&$�5�2��8 `�V���.�A��?�6#!�):57�4#��Xr<Ƥp��&��E� �M�K^�����z�WM~�X��Cp���ˣ��$�e.&��

.env

@@ -1,4 +1,3 @@
 .dev.env filter=git-crypt diff=git-crypt
-.env filter=git-crypt diff=git-crypt
-src/environments/.keys.json filter=git-crypt diff=git-crypt
-src/environments/keys.ts filter=git-crypt diff=git-crypt
+.prod.env filter=git-crypt-PROD diff=git-crypt-PROD
+.stage.env filter=git-crypt-STAGE diff=git-crypt-STAGE