Adding of maven project
fixing conflict