Resolve merge conflict.
Resolve all conflicts.
remove troubleshoot codes and in populateObjectInEditWindow() function
Resolved all conflicts.
Resolve all conflicts.
Resolve all conflicts.
Resolved all conflicts.