project added
resolved the conflicts