removing q button
fixing merge conflicts