Merge conflicts fixed.updating local changes
Added EditQB