Payment porvider integration completed.
Client creating missing fixed.
Conflicts respoved and fixed issues after merge
Checking in missing file