Solved pull conflicts. Added menu for tools