Fixed the damn GIT MERGE SHIT...and got signins working.