Resolving merge conflict

SwingView.form