Resolved Conflicts + Main User screen Work