project initiated.
removed conflits after pull the code