Project is able to deployed at any time
conflicts merged