Phase2 shashlik07

Resolve conflict in buildfile