Fixed merge conflicts, but it still doesn't show what I comitted