BalaRaju - Added git file
BalaRaju - removed confilts