Resolved conflict and added window lock shortcut