Changes made:
1) Added action bar
2) Resolved conflicts