removed pythoncomplete
removed conflicts
fixed merge conflicts