updated application merge &2
updated modules merge