afew errors left by merge fixed