adding workspace
fixing conflict