resolved conflicts in favor of Sameer's code and removed extraneous files