Few changes in application logic
Fixing conflicts