Resolved conflicts, preparing to merge with anurag