cleaning up the merge mess... Check ur individual workspaces for proper functioning..