conflicts resolved - sorry guys + right click menu improved a bit