Repaired conflicts
Added Referenced Library
Merge branch 'repaired'