Re-added css files gone missing after merge