Correct previously unfixed merge
Correct previously unfixed merge

10layer/alaveteli,hasadna/alaveteli,andreicristianpetcu/alaveteli_old,andreicristianpetcu/alaveteli,sarhane/alaveteli-test,obshtestvo/alaveteli-bulgaria,codeforcroatia/alaveteli,Br3nda/alaveteli,hasadna/alaveteli,nzherald/alaveteli,nzherald/alaveteli,obshtestvo/alaveteli-bulgaria,TEDICpy/QueremoSaber,sarhane/alaveteli-test,Br3nda/alaveteli,petterreinholdtsen/alaveteli,sarhane/alaveteli-test,4bic/alaveteli,hasadna/alaveteli,Br3nda/alaveteli,Br3nda/alaveteli,andreicristianpetcu/alaveteli_old,4bic/alaveteli,sarhane/alaveteli-test,codeforcroatia/alaveteli,andreicristianpetcu/alaveteli_old,Br3nda/alaveteli,petterreinholdtsen/alaveteli,codeforcroatia/alaveteli,4bic/alaveteli,andreicristianpetcu/alaveteli_old,petterreinholdtsen/alaveteli,TEDICpy/QueremoSaber,petterreinholdtsen/alaveteli,nzherald/alaveteli,4bic/alaveteli,10layer/alaveteli,obshtestvo/alaveteli-bulgaria,4bic/alaveteli,obshtestvo/alaveteli-bulgaria,nzherald/alaveteli,datauy/alaveteli,codeforcroatia/alaveteli,andreicristianpetcu/alaveteli_old,TEDICpy/QueremoSaber,TEDICpy/QueremoSaber,nzherald/alaveteli,datauy/alaveteli,andreicristianpetcu/alaveteli,petterreinholdtsen/alaveteli,andreicristianpetcu/alaveteli,hasadna/alaveteli,datauy/alaveteli,obshtestvo/alaveteli-bulgaria,TEDICpy/QueremoSaber,andreicristianpetcu/alaveteli,hasadna/alaveteli,andreicristianpetcu/alaveteli,hasadna/alaveteli,10layer/alaveteli