Resolved conflicts
Changed navigation bar