Added references
Resolved conflits for references